fix: rs conflict with fallback to patch #3559
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zachaller
changed the title
Go Published Test Results2 162 tests 2 162 ✅ 2m 54s ⏱️ Results for commit ec9d9b0. ♻️ This comment has been updated with latest results. |
E2E Tests Published Test Results 4 files 4 suites 3h 24m 40s ⏱️ For more details on these failures, see this check. Results for commit ec9d9b0. ♻️ This comment has been updated with latest results. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3559 +/- ##
==========================================
- Coverage 81.83% 80.26% -1.58%
==========================================
Files 135 156 +21
Lines 20688 17970 -2718
==========================================
- Hits 16931 14424 -2507
+ Misses 2883 2634 -249
- Partials 874 912 +38 ☔ View full report in Codecov by Sentry. |
zachaller
force-pushed
the
fix-rs-conflict-with-fallback-to-patch
branch
from
ef796a4 to
16e67ce
Compare
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix: switch to retry logic Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry experiments Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove TODO Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry to setting revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump slsa-framework/slsa-github-generator from 1.10.0 to 2.0.0 (argoproj#3537) chore(deps): bump slsa-framework/slsa-github-generator Bumps [slsa-framework/slsa-github-generator](https://github.com/slsa-framework/slsa-github-generator) from 1.10.0 to 2.0.0. - [Release notes](https://github.com/slsa-framework/slsa-github-generator/releases) - [Changelog](https://github.com/slsa-framework/slsa-github-generator/blob/main/CHANGELOG.md) - [Commits](slsa-framework/slsa-github-generator@v1.10.0...v2.0.0) --- updated-dependencies: - dependency-name: slsa-framework/slsa-github-generator dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump sigstore/cosign-installer from 3.4.0 to 3.5.0 (argoproj#3522) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](sigstore/cosign-installer@e1523de...59acb62) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump golangci/golangci-lint-action from 4 to 5 (argoproj#3540) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4 to 5. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4...v5) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> docs: provide recommendation for strategies (argoproj#3531) * docs: provide recommendation for strategies Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: traffic manager clarifications Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: explain canary with/out traffic manager Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: add 3 columns on the comparison table Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> --------- Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> feat(dashboard): change the color of the current rollout step (argoproj#3526) I feel that having the current (running) step in a orange color is misleading, as orange usually means warning. This commit changes the color to the `$argo-running-color`. Signed-off-by: Alejandro López Sánchez <alejandro.lopez@factorial.co> chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch from 1.37.0 to 1.38.0 (argoproj#3525) chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) from 1.37.0 to 1.38.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.38.0/CHANGELOG.md) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.37.0...service/s3/v1.38.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> perform all of set revision actions on retry Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix variable Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clean logs, always dump controller e2e logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lower timeout Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump timeout on e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry on rollout conflict Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't reque on rs changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> reque rs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump qps for e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix gen-crd Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> move log lines Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix one e2e test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump actions/setup-go from 5.0.0 to 5.0.1 (argoproj#3552) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump codecov/codecov-action from 4.3.0 to 4.3.1 (argoproj#3550) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0 (argoproj#3548) Bumps google.golang.org/protobuf from 1.33.0 to 1.34.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> refactor Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test for updating rs revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry for ephemeral metadata Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clear some fields Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> refactor into function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to patch fallback Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch ephemeral metadata sync to shared function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch merge type Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't update status Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to not use patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to small patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> some cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove not found rollout removal Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> working setup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> small cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
zachaller
force-pushed
the
fix-rs-conflict-with-fallback-to-patch
branch
from
16e67ce to
7943d8d
Compare
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
…s-conflict-with-fallback-to-patch
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
leoluz
requested changes
Jun 5, 2024
Comment on lines
+795
to
+799
| func (f *fixture) expectGetReplicaSetAction(r *appsv1.ReplicaSet) int { //nolint:unused | ||
| len := len(f.kubeactions) | ||
| f.kubeactions = append(f.kubeactions, core.NewGetAction(schema.GroupVersionResource{Resource: "replicasets"}, r.Namespace, r.Name)) | ||
| return len | ||
| } |
There was a problem hiding this comment.
we should probably add several test cases to validate the new updateReplicaSetFallbackToPatch method
There was a problem hiding this comment.
There are two test that cover most the happy paths to lock in the behavior on the two conflict points here. I don't think it's worth going down a lot of the error paths like incorrect json marshal's etc.
There was a problem hiding this comment.
codecovs percentages don't always make sense to me, here is the coverage of that function https://app.codecov.io/gh/argoproj/argo-rollouts/pull/3559?src=pr&el=tree&filepath=rollout%2Fcontroller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#6b8a01c38fada35656503847a6f4a00d-R951
There was a problem hiding this comment.
It seems that the coverage is comparing the wrong base from the link above.
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
…s-conflict-with-fallback-to-patch
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
leoluz
requested changes
Jun 7, 2024
Comment on lines
+795
to
+799
| func (f *fixture) expectGetReplicaSetAction(r *appsv1.ReplicaSet) int { //nolint:unused | ||
| len := len(f.kubeactions) | ||
| f.kubeactions = append(f.kubeactions, core.NewGetAction(schema.GroupVersionResource{Resource: "replicasets"}, r.Namespace, r.Name)) | ||
| return len | ||
| } |
There was a problem hiding this comment.
It seems that the coverage is comparing the wrong base from the link above.
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
|
zachaller
added a commit
that referenced
this pull request
Jun 10, 2024
* fix: fallback to patch on scale conflict Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix: switch to retry logic Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry experiments Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove TODO Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry to setting revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump slsa-framework/slsa-github-generator from 1.10.0 to 2.0.0 (#3537) chore(deps): bump slsa-framework/slsa-github-generator Bumps [slsa-framework/slsa-github-generator](https://github.com/slsa-framework/slsa-github-generator) from 1.10.0 to 2.0.0. - [Release notes](https://github.com/slsa-framework/slsa-github-generator/releases) - [Changelog](https://github.com/slsa-framework/slsa-github-generator/blob/main/CHANGELOG.md) - [Commits](slsa-framework/slsa-github-generator@v1.10.0...v2.0.0) --- updated-dependencies: - dependency-name: slsa-framework/slsa-github-generator dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump sigstore/cosign-installer from 3.4.0 to 3.5.0 (#3522) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](sigstore/cosign-installer@e1523de...59acb62) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump golangci/golangci-lint-action from 4 to 5 (#3540) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4 to 5. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4...v5) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> docs: provide recommendation for strategies (#3531) * docs: provide recommendation for strategies Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: traffic manager clarifications Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: explain canary with/out traffic manager Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: add 3 columns on the comparison table Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> --------- Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> feat(dashboard): change the color of the current rollout step (#3526) I feel that having the current (running) step in a orange color is misleading, as orange usually means warning. This commit changes the color to the `$argo-running-color`. Signed-off-by: Alejandro López Sánchez <alejandro.lopez@factorial.co> chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch from 1.37.0 to 1.38.0 (#3525) chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) from 1.37.0 to 1.38.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.38.0/CHANGELOG.md) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.37.0...service/s3/v1.38.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> perform all of set revision actions on retry Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix variable Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clean logs, always dump controller e2e logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lower timeout Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump timeout on e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry on rollout conflict Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't reque on rs changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> reque rs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump qps for e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix gen-crd Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> move log lines Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix one e2e test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump actions/setup-go from 5.0.0 to 5.0.1 (#3552) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump codecov/codecov-action from 4.3.0 to 4.3.1 (#3550) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0 (#3548) Bumps google.golang.org/protobuf from 1.33.0 to 1.34.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> refactor Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test for updating rs revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry for ephemeral metadata Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clear some fields Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> refactor into function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to patch fallback Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch ephemeral metadata sync to shared function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch merge type Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't update status Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to not use patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to small patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> some cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove not found rollout removal Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> working setup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> small cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * typo Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup commented out code Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * only patch rollouts manged fields Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * reduce patch size Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * get some logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * improve tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add env var to log diff Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove expirment rs patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * imporve logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * use correct variable Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * change env var Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove not found rollouts Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * update replica count Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * refactor cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * keep track of UpdatedReplicas on sync Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * some hpa tests and log changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove update to UpdatedReplicas Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add more test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * undo change Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add comment to flaky tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup Makefile Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * use labels Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove make file change Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add label to test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * review changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * change to TODO Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add extra logging for tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add ignore to codecov Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * we always generate patch because we are comparing against emtpy obj Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> --------- Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
zachaller
added a commit
that referenced
this pull request
Jun 13, 2024
* fix: fallback to patch on scale conflict Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix: switch to retry logic Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry experiments Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove TODO Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry to setting revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump slsa-framework/slsa-github-generator from 1.10.0 to 2.0.0 (#3537) chore(deps): bump slsa-framework/slsa-github-generator Bumps [slsa-framework/slsa-github-generator](https://github.com/slsa-framework/slsa-github-generator) from 1.10.0 to 2.0.0. - [Release notes](https://github.com/slsa-framework/slsa-github-generator/releases) - [Changelog](https://github.com/slsa-framework/slsa-github-generator/blob/main/CHANGELOG.md) - [Commits](slsa-framework/slsa-github-generator@v1.10.0...v2.0.0) --- updated-dependencies: - dependency-name: slsa-framework/slsa-github-generator dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump sigstore/cosign-installer from 3.4.0 to 3.5.0 (#3522) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](sigstore/cosign-installer@e1523de...59acb62) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump golangci/golangci-lint-action from 4 to 5 (#3540) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4 to 5. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4...v5) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> docs: provide recommendation for strategies (#3531) * docs: provide recommendation for strategies Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: traffic manager clarifications Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: explain canary with/out traffic manager Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: add 3 columns on the comparison table Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> --------- Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> feat(dashboard): change the color of the current rollout step (#3526) I feel that having the current (running) step in a orange color is misleading, as orange usually means warning. This commit changes the color to the `$argo-running-color`. Signed-off-by: Alejandro López Sánchez <alejandro.lopez@factorial.co> chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch from 1.37.0 to 1.38.0 (#3525) chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) from 1.37.0 to 1.38.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.38.0/CHANGELOG.md) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.37.0...service/s3/v1.38.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> perform all of set revision actions on retry Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix variable Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clean logs, always dump controller e2e logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lower timeout Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump timeout on e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry on rollout conflict Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't reque on rs changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> reque rs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump qps for e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix gen-crd Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> move log lines Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix one e2e test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump actions/setup-go from 5.0.0 to 5.0.1 (#3552) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump codecov/codecov-action from 4.3.0 to 4.3.1 (#3550) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0 (#3548) Bumps google.golang.org/protobuf from 1.33.0 to 1.34.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> refactor Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test for updating rs revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry for ephemeral metadata Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clear some fields Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> refactor into function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to patch fallback Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch ephemeral metadata sync to shared function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch merge type Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't update status Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to not use patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to small patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> some cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove not found rollout removal Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> working setup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> small cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * typo Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup commented out code Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * only patch rollouts manged fields Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * reduce patch size Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * get some logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * improve tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add env var to log diff Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove expirment rs patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * imporve logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * use correct variable Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * change env var Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove not found rollouts Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * update replica count Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * refactor cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * keep track of UpdatedReplicas on sync Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * some hpa tests and log changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove update to UpdatedReplicas Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add more test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * undo change Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add comment to flaky tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup Makefile Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * use labels Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove make file change Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add label to test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * review changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * change to TODO Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add extra logging for tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add ignore to codecov Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * we always generate patch because we are comparing against emtpy obj Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> --------- Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
zachaller
added
the
cherry-pick-completed
|
hey @zachaller It seems like this has had me chasing my tail for a few weeks now in relation to: #3569 We've been using the notification engine separately to create sqs events back to the deploying software on rollout progression and other factors. We've been seeing, as the ticket describes, rollouts that seem to hang for a very long time once they've completed their steps and then eventually they will suddenly resolve themselves, or we can go into the rollout and make some manual status block changes to unblock them. It wasn't every rollout, but it was a significant percentage of them. I'm wondering if the updates on the rollout to the I'm now excited to try out 1.7.* once it's had a few days for other people to find any bugs for me ;) maybe 1.7.1. Though it looks like maybe this got cherry picked into 1.6, i guess i can wait for a 1.6.7 as well. Do you think my hypothesis makes sense? |
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When updating a replicaset if we get a conflict with the replicaset, we fallback to a patch. This prevents us from getting into a loop of conflicts and preventing scaling from occurring. This is more of a temporary hot fix until a larger refactor can happen around how rollouts manages replicasets.